Merge commit 'upstream/1.3.5'
authorJohn Goerzen <jgoerzen@complete.org>
Wed, 16 Jul 2008 18:04:03 +0000 (13:04 -0500)
committerJohn Goerzen <jgoerzen@complete.org>
Wed, 16 Jul 2008 18:04:03 +0000 (13:04 -0500)
commit08d1f52c6597ca0130b6da90306812af680cdcaf
treec94c904809796f78280abee1f576d1e341fe99fb
parente67f52590cfc8506f11adbc82eac7edf15114548
parent916bfd88d30bf36b0526b0bcf1febfa4fddc211a
Merge commit 'upstream/1.3.5'

Conflicts:

.hgtags
Makefile.in